Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add and improve debuginfo tests for Windows #135192

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add and improve debuginfo tests for Windows #135192

wants to merge 1 commit into from
+294 −49

Conversation

jdupak-ms
Copy link

Adds new test for closures and function pointers.
Improves robustness of existing tests by sorting wildcard matched outputs.

@rustbot
Copy link
Collaborator

rustbot commented Jan 7, 2025

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 7, 2025
@jdupak-ms
Copy link
Author

CC @wesleywiser

@jieyouxu jieyouxu added O-windows Operating system: Windows A-debuginfo Area: Debugging information in compiled programs (DWARF, PDB, etc.) labels Jan 7, 2025
jieyouxu
jieyouxu reviewed Jan 7, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do these tests need to be gated by some kind of minimum cdb version?

@jieyouxu jieyouxu added the A-testsuite Area: The testsuite used to check the correctness of rustc label Jan 7, 2025
@jdupak-ms
Copy link
Author

Do these tests need to be gated by some kind of minimum cdb version?

They should not. I will try to get some old cdb and verify.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 7, 2025

FTR, that is mostly relevant in periods of times where our CI has like a weird mix of 2 cdb versions, e.g. when github gradually rolls out Windows server version bumps. Probably not needed in this case.

wesleywiser
wesleywiser approved these changes Jan 7, 2025
View reviewed changes
Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jdupak-ms! I don't see anything here that should require a particularly recent version of cdb to work but if you can test on an older version, that would be great!

If not, let us know and we can merge.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 8, 2025 •
edited
Loading

I don't really expect a cdb version problem since we're currently not in a cdb transition period, so let's just send this off to see if this passes full CI.

@bors r=@wesleywiser rollup=iffy (debuginfo windows tests)

@bors
Copy link
Contributor

bors commented Jan 8, 2025

📌 Commit f86ca11 has been approved by wesleywiser

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2025
@jdupak-ms
Copy link
Author

I don't really expect a cdb version problem since we're currently not in a cdb transition period, so let's just send this off to see if this passes full CI.

@bors r=@wesleywiser rollup=iffy (debuginfo windows tests)

OK, sorry for the delay. I had trouble with getting the older cdb to be picked up on my machine.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 8, 2025

OK, sorry for the delay. I had trouble with getting the older cdb to be picked up on my machine.

Thanks for trying anyway!

@bors
Copy link
Contributor

bors commented Jan 8, 2025

⌛ Testing commit f86ca11 with merge 7d9573b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2025
@bors
Auto merge of rust-lang#135192 - jdupak-ms:cdb-tests, r=wesleywiser
7d9573b 
Add and improve debuginfo tests for Windows

Adds new test for closures and function pointers.
Improves robustness of existing tests by sorting wildcard matched outputs.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 8, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 8, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jan 8, 2025

Ah, you may have to add a // ignore-tidy-linelength in the two tests

2025-01-08T15:28:24.6649510Z tidy error: /Users/runner/work/rust/rust/tests/debuginfo/type-names.rs:172: line longer than 100 chars
2025-01-08T15:28:24.6667640Z tidy error: /Users/runner/work/rust/rust/tests/debuginfo/lexical-scope-in-if-let.rs:50: line longer than 100 chars

@jieyouxu jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 8, 2025
@jdupak-ms
Copy link
Author

Fixed, python ./x.py test tidy --bless now does not complain.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 8, 2025

(You may have forgotten to push local changes)

@jdupak-ms
Copy link
Author

(You may have forgotten to push local changes)

Yes, my apologies. Pushed now.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 8, 2025

@bors r=@wesleywiser rollup=iffy

@bors
Copy link
Contributor

bors commented Jan 8, 2025

📌 Commit d69b6ea has been approved by wesleywiser

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 8, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2025
@bors
Auto merge of rust-lang#135192 - jdupak-ms:cdb-tests, r=wesleywiser
e8c1903 
Add and improve debuginfo tests for Windows

Adds new test for closures and function pointers.
Improves robustness of existing tests by sorting wildcard matched outputs.
@bors
Copy link
Contributor

bors commented Jan 9, 2025

⌛ Testing commit d69b6ea with merge e8c1903...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 9, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 9, 2025
@jdupak-ms
Copy link
Author

Oh, I fixed the format and forgot to modify the gdb check. Fixed now.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

jieyouxu commented Jan 9, 2025

Ah sorry the PR CI never ran lol

@jdupak-ms
Copy link
Author

@jieyouxu one CI more please :), my git push was "hanging" in vscode. Not sure why.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

jieyouxu commented Jan 9, 2025

@jieyouxu one CI more please :), my git push was "hanging" in vscode. Not sure why.

(The PR CI will automatically run on force pushes, I just had to approve the workflow to start because apparently it's your first contribution here :3)

@jdupak-ms
Copy link
Author

(Apparently it is blocked again https://github.com/rust-lang/rust/actions/runs/12688730569 🤷)

@jieyouxu
Copy link
Member

jieyouxu commented Jan 9, 2025

Screenshot 2025-01-09 191636

Lol there isn't even a button shown here to approve and run, I had to click on the workflow itself

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

@jieyouxu jieyouxu

Labels
A-debuginfo Area: Debugging information in compiled programs (DWARF, PDB, etc.) A-testsuite Area: The testsuite used to check the correctness of rustc O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jdupak-ms @rustbot @jieyouxu @bors @rust-log-analyzer @wesleywiser @Mark-Simulacrum